From 56d1a3fa40816f8ccf6c5878e050ae2ed3703c54 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 24 May 2006 11:57:37 +0100 Subject: [PATCH] Fix kcons_write and kcons_write_dom0 CodingStyle. Use roundup_pow_of_two(). Signed-off-by: Chris Wright --- .../drivers/xen/console/console.c | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c index 9a2eaefdbf..edc44b73cb 100644 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c @@ -117,8 +117,11 @@ static int __init xencons_bufsz_setup(char *str) { unsigned int goal; goal = simple_strtoul(str, NULL, 0); - while (wbuf_size < goal) - wbuf_size <<= 1; + if (goal) { + goal = roundup_pow_of_two(goal); + if (wbuf_size < goal) + wbuf_size = goal; + } return 1; } __setup("xencons_bufsz=", xencons_bufsz_setup); @@ -133,8 +136,7 @@ static struct tty_driver *xencons_driver; /******************** Kernel console driver ********************************/ -static void kcons_write( - struct console *c, const char *s, unsigned int count) +static void kcons_write(struct console *c, const char *s, unsigned int count) { int i = 0; unsigned long flags; @@ -155,14 +157,14 @@ static void kcons_write( spin_unlock_irqrestore(&xencons_lock, flags); } -static void kcons_write_dom0( - struct console *c, const char *s, unsigned int count) +static void kcons_write_dom0(struct console *c, const char *s, unsigned int count) { - int rc; - while ((count > 0) && - ((rc = HYPERVISOR_console_io( - CONSOLEIO_write, count, (char *)s)) > 0)) { + while (count > 0) { + int rc; + rc = HYPERVISOR_console_io( CONSOLEIO_write, count, (char *)s); + if (rc <= 0) + break; count -= rc; s += rc; } -- 2.30.2